Zendesk e2e enhancement #5

Vipinofficial11 · 2023-02-28T15:18:29Z

No description provided.

Vipinofficial11 · 2023-02-28T16:27:20Z

src/e2e-test/features/zendesksource/RunTimeWithMacros.feature


-  @TS-ZD-RNTM-MACRO-02 @BQ_SINK @BQ_SINK_CLEANUP @FILE_PATH
+  @TS-ZD-RNTM-MACRO-02 @BQ_SINK @BQ_SINK_CLEANUP @TEST_DATA @DELETE_TEST_DATA


Hook's value is @CREATE_GROUP I guess you have used a wrong one here.

Vipinofficial11 · 2023-02-28T16:27:58Z

src/e2e-test/features/zendesksource/RunTimeWithMacros.feature

@@ -17,7 +17,7 @@
 @Regression
 Feature: Zendesk Source - Run time scenarios

-  @TS-ZD-RNTM-MACRO-01 @BQ_SINK @BQ_SINK_CLEANUP @FILE_PATH
+  @TS-ZD-RNTM-MACRO-01 @BQ_SINK @BQ_SINK_CLEANUP @TEST_DATA @DELETE_TEST_DATA


Hook's value is @CREATE_GROUP, update the value here.

Vipinofficial11 · 2023-02-28T16:29:59Z

src/e2e-test/java/io/cdap/plugin/tests/hooks/TestSetupHooks.java


 /**
 * Represents Test Setup and Clean up hooks.
 */
 public class TestSetupHooks {
-  private static boolean firstFileSinkTestFlag = true;
+  public static String testdata_Group = "";


use camel case in the naming instead of underscore. (testdata_Group -> groupResponse)

Vipinofficial11 · 2023-02-28T16:30:30Z

src/e2e-test/java/io/cdap/plugin/tests/hooks/TestSetupHooks.java


 /**
 * Represents Test Setup and Clean up hooks.
 */
 public class TestSetupHooks {
-  private static boolean firstFileSinkTestFlag = true;
+  public static String testdata_Group = "";
+  public static String cred = "";


change cred -> credentials

Vipinofficial11 · 2023-02-28T16:31:17Z

src/e2e-test/java/io/cdap/plugin/tests/hooks/TestSetupHooks.java

+  @After(order = 2, value = "@DELETE_GROUP")
+  public void deleteGroup() {
+       DataValidationHelper.deleteGroup(cred);
+  }
  }


fix the indentation

Vipinofficial11 · 2023-02-28T16:32:02Z

src/e2e-test/java/io/cdap/plugin/zendesk/actions/DataValidationHelper.java

+ * Zendesk utility - enhancements.
+ */
+public class DataValidationHelper {
+  private static String baseURI = "https://cloudsufi.zendesk.com/api/v2";


We can put this base URI in the plugin parameter properties file.

Vipinofficial11 · 2023-02-28T16:32:23Z

src/e2e-test/java/io/cdap/plugin/zendesk/actions/DataValidationHelper.java

+      .header("authorization", cred)
+      .delete(baseURI + "/groups/" + ZendeskPropertiesPageActions.uniqueId + ".json");
+  }
+  }


fix Indentation

Vipinofficial11 · 2023-02-28T16:33:07Z

src/e2e-test/java/io/cdap/plugin/zendesk/actions/ZendeskPropertiesPageActions.java

-      BigInteger uniqueId = expectedOutputAsJson.get("id").getAsBigInteger();
+      JsonObject expectedOutputAsJson = gson.fromJson(TestSetupHooks.testdata_Group, JsonObject.class);
+      JsonObject group = (JsonObject) expectedOutputAsJson.get("group");
+      System.out.println(group);


remove System.out.println()

Vipinofficial11 · 2023-02-28T16:34:52Z

src/e2e-test/java/io/cdap/plugin/zendesk/actions/ZendeskPropertiesPageActions.java

    }
-  }
+

  public static void verifyIfRecordCreatedInSinkForMultipleObjectsAreCorrect(String expectedOutputFile)


Revert all the spacing related changes in this method.

Vipinofficial11 · 2023-02-28T16:39:01Z

src/e2e-test/java/io/cdap/plugin/zendesk/actions/ZendeskPropertiesPageActions.java

@@ -149,13 +143,17 @@ static boolean compareValueOfBothResponses(String zendeskResponse, String bigQue
    Map<String, Object> bigQueryResponseInMap = gson.fromJson(bigQueryResponse, type);
    MapDifference<String, Object> mapDifference = Maps.difference(zendeskResponseInmap, bigQueryResponseInMap);
    logger.info("Assertion :" + mapDifference);
-
    return mapDifference.areEqual();
  }

  public static void getBigQueryTableData(String dataset, String table, BigInteger uniqueId)


We have written the altered query here specifically for groups but this method getBigQueryTableData is common and can be used to fetch data from any big query table, this will throw an error if the table consist data of another object. (For ex: Tags may not have field like updatedAt and createdAt).

The objects we are using : Groups and Organisations , both have the same fields.

Vipinofficial11 · 2023-02-28T16:39:43Z

src/test/java/io/cdap/plugin/zendesk/source/batch/ZendeskBatchSourceConfigTest.java

@@ -41,7 +41,7 @@
 public class ZendeskBatchSourceConfigTest {

  private static final String MOCK_STAGE = "mockStage";
-  private static MockPipelineConfigurer pipelineConfigurer = null;
+  private static MockPipelineConfigurer pipelineConfigure = null;


revert this change, not related to Automation.

Vipinofficial11 · 2023-02-28T16:40:12Z

src/test/java/io/cdap/plugin/zendesk/source/batch/ZendeskBatchSourceConfigTest.java

@@ -352,8 +352,8 @@ public void testConfigurePipelineWithInvalidBasicParam() {
      "");
    try {
      ZendeskBatchSource zendeskBatchSource = new ZendeskBatchSource(config);
-      pipelineConfigurer = new MockPipelineConfigurer(null);
-      zendeskBatchSource.configurePipeline(pipelineConfigurer);
+      pipelineConfigure = new MockPipelineConfigurer(null);


Revert these changes.

Vipinofficial11 · 2023-02-28T16:40:17Z

src/test/java/io/cdap/plugin/zendesk/source/batch/ZendeskBatchSourceConfigTest.java

@@ -414,8 +414,8 @@ public void testConfigurePipelineMultiSourceWithInvalidBasicParam() {
      "");
    try {
      ZendeskBatchMultiSource zendeskBatchMultiSource = new ZendeskBatchMultiSource(config);
-      pipelineConfigurer = new MockPipelineConfigurer(null);
-      zendeskBatchMultiSource.configurePipeline(pipelineConfigurer);
+      pipelineConfigure = new MockPipelineConfigurer(null);


Revert these changes.

E2E Enhancements

59ac3cc

Vipinofficial11 commented Feb 28, 2023

View reviewed changes

Re-work

3833653

satyamsufi force-pushed the E2E_Test_Enhancement branch from 230dd4e to 3833653 Compare March 2, 2023 06:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Zendesk e2e enhancement #5

Zendesk e2e enhancement #5

Vipinofficial11 commented Feb 28, 2023

Vipinofficial11 Feb 28, 2023

Vipinofficial11 Feb 28, 2023

Vipinofficial11 Feb 28, 2023

Vipinofficial11 Feb 28, 2023

Vipinofficial11 Feb 28, 2023

Vipinofficial11 Feb 28, 2023

Vipinofficial11 Feb 28, 2023

Vipinofficial11 Feb 28, 2023

Vipinofficial11 Feb 28, 2023

Vipinofficial11 Feb 28, 2023

satyamsufi Mar 2, 2023

Vipinofficial11 Feb 28, 2023

Vipinofficial11 Feb 28, 2023

Vipinofficial11 Feb 28, 2023


		@TS-ZD-RNTM-MACRO-02 @BQ_SINK @BQ_SINK_CLEANUP @FILE_PATH
		@TS-ZD-RNTM-MACRO-02 @BQ_SINK @BQ_SINK_CLEANUP @TEST_DATA @DELETE_TEST_DATA

Zendesk e2e enhancement #5

Are you sure you want to change the base?

Zendesk e2e enhancement #5

Conversation

Vipinofficial11 commented Feb 28, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment